Uncomment the GnomeCanvasPixbuf sources. This should be made conditional,

1999-11-29  Federico Mena Quintero  <federico@redhat.com>

	* src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources.  This
	should be made conditional, not blindly commented out.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index c461d45b998c00d9838b1c9c0859d18c1a99c37e..56c7990a496e90122438fa044625b618a7fc826d 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-29  Federico Mena Quintero  <federico@redhat.com>
+
+       * src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources.  This
+       should be made conditional, not blindly commented out.
+
 1999-11-29  Jonathan Blandford  <jrb@redhat.com>
 
        * src/Makefile.am (ICO_LIB): Added another loader from Arjan to

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index afb095e5f14e8663cc68cd696ed912107b2ac6dd..af244fa71c4e143d8cf2536c56931e2bd3bf77a1 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -47,10 +47,10 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
 LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
-testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) \
+testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) \
        -lgmodule
 
-testpixbuf_drawable_LDADD = $(LDADDS)
+testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
 
 GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
@@ -65,16 +65,16 @@ libgdk_pixbuf_la_SOURCES =  \
        gdk-pixbuf-io.c         \
        gdk-pixbuf-loader.c     \
        gdk-pixbuf-render.c     \
-       gdk-pixbuf-drawable.c
-##     gnome-canvas-pixbuf.c
+       gdk-pixbuf-drawable.c   \
+       gnome-canvas-pixbuf.c
 
 libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
 
 libgdk_pixbufinclude_HEADERS = \
        gdk-pixbuf.h            \
        gdk-pixbuf-drawable.h   \
-       gdk-pixbuf-loader.h
-##     gnome-canvas-pixbuf.h
+       gdk-pixbuf-loader.h     \
+       gnome-canvas-pixbuf.h
 
 noinst_HEADERS = \
        gdk-pixbuf-io.h